tidy up for maxmind2 following code review