Some automated rubocop cleanups