Bad bad at refactoring