comment handling cleanup