Checkers after refactoring