Refactoring, less code is better