Fixed up challenge 3 in set 1, more improvements to come