Refactoring to break my friend's nerves.