Made changes according to spec in challenge.