Changed: refactor use of point object part I
Changed: refactor use of point object part II