Change ALL the things

Too much coffee make brian refactor all the things.