Some rubocop cleanups