more comment & clean up