ArtifactsBonusFeedbackHours2TagsState refactoring review and conflict resolution (#209); Further state refactoring cleanup and improvements