Cleanup and submit

Don't worry, I submitted last night, I just forgot to push.