266: Updating with rohans suggestions to tidy up and 'rubify' the code. Thanks for the tips Rohan!