Refactoring and correcting board definitions.