Monsters refactored