refactor#2

refactor in view