some style improvements

Seriously. I'm going to slap the next guy to leave a "button1" in there.