More ruby style fixes