Snap in refactor