Refactor: Grouping up responsibilities in sugar mode