if statements converted, missed 3 commented lines too