Small code style cleanups

(some of this was breaking syntax highighting in vim)