Snapshot

Tidied up redundant code