remove sugar & refactoring