refactoring + stats on snapshots