A bit of a tidy up
MOAR RUBY