- refactored Point