Major tidy up
Get rid of ruby-calisthenics et al