Minor cleanup
Improved avoidance of repeating or boring challenges