RuboCop fix + source update