Clean up the code I wrote Friday afternoon while in a terrible mood