Update rubocop config
Consolidate ruby style