now return code handling is correct and incorrect commeent blocks are removed