Enhancement:

 - Final clean-up of work for mapping optimization