Refactoring 4 life