various style cleanups and whatnot