More refactoring, Snap points