Rubocop fixes

Applied fixes for some of the rubocop complaints.  However, the rest are
complaints against code that is purposefully breaking style in order to conform
to either similar code in the same class or similar code that implements similar
functionality.