Streamlines address format and adds comments for translators