Rubocop: More fixes and cleanups