Refactorings

* Board