cleaned up code; replaced ViewPort and zoomStrategy