rubocop compliance
Merge branch 'enhancements'