Refactoring to make more use of Point.funcs instead of global funcs