A few changes to fullfill the google coding specifications