Reformat a bit, and bring more ruby style
Merge pull request #1 from avsej/master

Small style fix