Refactoring! That's all I can make of it, today :(