Cleaned up setupBoard
Cleaned up setupBoard