Cleaned up a little of the board code