Simplify initial board setup and reindent defns.