Cleans this up for a second attempt at building this project now that I'm slightly less incompetent.