Fixed commented issues