More refactoring (specifically with board)