Cleaned up some parts of Board