Comment handling improvements