various cleanup

Just some spring cleaning; probably best to view [here](https://github.com/localshred/protobuf/pull/234/files?w=1) to ignore whitespace
rubocop wanted a guard clause (early return) which didn't really make sense, so re-arranging was the nicest solution