proper comment handling