Added Point location, code refactoring.