clean it up

last night I wanted to push it up as quickly as possible so I didn't
refactor anything. I couldn't let the code sit like that though.