Bunch of ruby style tweaks