Small changes to map formatting