Comment parsing updated