refactor changes

changes for tempalte