Refactored PhoneNumber to its own class