Change function name & remove commented HTML