Clean up as per Ruby style guides
Rubocop driven tidy up