minor cleanup on the datahandler