refactor#1

Refactor 1
refactor#2

refactor in view