cleanup compilation error and map literal return values