various cleanup

Just some spring cleaning; probably best to view [here](https://github.com/localshred/protobuf/pull/234/files?w=1) to ignore whitespace
Why re-arrange here?