Bad formatting in these three classes breaks my nerve
Merge pull request #380 from jtorrente/formatting

Bad formatting in these three classes breaks my nerve