Change old style hash format
Add missing spaces
Merge branch 'rubocop'