Added a random challenge
Simple cleaning up