Some rubocop cleanup

Not complete, but good enough for now.