Refactored Board