About to split out arithmetic expressions
Finished Rubocop re-factor for now
Merge branch 'rubocop-update'