Cleaned Challenge 1 code a bit