simpler comment handling