improving city structure
updating column names
Merge branch 'split'