Tidies up to addresses