hotfix crash & cleanup Board.java