Incorporating lots of rubocops suggestions for code style fixes
More rubocop suggestions