cleaning up imports/exports and error messages