Tidying up comment parsing