Hmm, refactoring forgotten