Tidying up Earth/Cartographer code