Refactor of Checkers