Snaps working in 2D ... some cleanup of code