Refactor and addition of last move info