axmap: code cleanups