refucktored view 1