rubocop cleanup, long lines, etc
Merge rubocop changes from Kernelsmith