modified for removing comments