Added zoom property to Camera
Clean up