Refactoring topoJSON stuff