added separate comment parsing