Updates to translation maps
Fix formatting