[IMP] Code refactor and view storeview view changes