Code re-styling to please Rubocop

Code style amendments to fix most Rubocop reported "offenses"