Modified snap point calculation
Cleanup