Slightly reorganize drawWorldMap