Clean up

Removed overly complicated structs.  No need for Points.  This is simple integer comparison.