Cleaned up PhoneField behaviour