refactored assigned comments