Refactoring, reduced code size