Better comment handling