HandleComment bug fix; cleanup