Code tidying
Move postcode into settings
Move postcode into settings