Little refactoring +xlog, +snap, snapshot->snap