clean up et refactor