Fixed Snip.cs with improvements as said by dlrudie