Cleaned up a few things in Board class