DEV: Sugar: Refactoring