fix breaking rubocop issues
Merge branch 'enhancements'