improve comment parsing