Cleanup, document, fix a hack for empty static map