remove comment code and needless closure