Refactored some methods and solved final country/state challenge.