clean up maphandler to lint standards