Excercise 3 and some more refactoring for phonebook spec