better (un)comment handling