Renaming and remove vars,add constant