potof view fix. refactering.