Some clean up and start to move to ViewExtent