Rubocop: Fixing style problems and adding check