Tidy up snapshot class