Mode updates
Re-factored per Rubocop
Re-factored per Rubocop
Merge branch 'rubocop-update'