Further tidying
Change pattern-matching for 'empty' to include areas outside the board