RuboCop improvements