Made a few ruby-esque changes