another pass at cleaning up the e3x api