Board: refactored for readability