remove comment codes
more refactor