Go Ahead, Make a Mess

Refactoring