Code cleanup after first commit.

Code cleanup done to fix most code style issues reported by Rubocop.