completed challenge 2 and a little cleanup