Cleanup on GenericMapper

Hi Elfego,

I'll like to share with you these changes, I hope you find it these usefull.