Minor fixes for latest ruby 2.0, better formatting.