Code review: Rubocop is much happier now