Cleaned up Mappers  - comments etc