snapshot: move comments to the right place