Fix comments and ruby < 2.0 compatibility