Changing points data structure

I believe this simplifies the code a little