Fix commenting/uncommenting