Cleaned up some syntax with new setters for `points` and `pairs`