imporved code quality of Archimedes.Maps