refactored the data class smell in worker. still need to clean up my work. will do that during saturday's meeting.