Refactoring, refactoring, refactoring!