More refactoring fun
Refactoring