Refactor: remove Point class to simplify code