streamlined the _mapper js