Code cleanliness

We should run Rubocop against the source and tidy up any obvious ugliness.