Hacking and refactoring