some style and misc changes, yes my commit messages are bad