Changing to using longs - removes warning message
Tidying up formatting
Removing unneeded nil checks for city and telephone