Pass at fix for Snapshot Create

And a bit of code cleanup.