Tidy up some of my ruby to be more conventional