Tidy up

Spacing and some punctuation tidied up automatically by Rubocop.
Add automatically generated Rubocop to-do list
Fix tests