Updated comment handling slightly