Issue-141 rewriting conditional statements