Remove comments code was refactored

RegExp is using for removing comments now. This works faster (~5-15%) and needs less code