Cleaned Challenge 2 code a bit