Map formatting

With minor style fixes