Some general cleanup and refactoring around Mappable
Updated examples