Code cleanup

Will is feeling very OCD right now