refactor GADMconverter code