Reformat a bit, and bring more ruby style