A little bit of tidy up in the ResourceSnapshotManager