cleaned mapper