Refactor of board complete