Re-factored with Rubocop help
Merge branch 'rubocop-update'
Removed accidentally addded set.txt