Pass at fix for Snapshot Create

And a bit of code cleanup.
Merge pull request #57 from andylyall/2014.03

Pass at fix for Snapshot Create