Bit of cleanup for IQSS/geoconnect#68