Fix up challenge1 to be more pythonic