Populated minefield, refactored