Refactoring (and the syntactic sugar)