Ongoing updates to adhere to the ruby style guide