Simplify, Refactoring