remove comment code and rename function