Refactoring for beauty