cleaning up code, adding postcode data