Clear up new RuboCop offences