Refactor board (and some other things)