Jokes. More refactoring.