remove strange dependency of nested classes and strip whitespaces from zipcode