Mild refactoring of snapshot method