[refactor] clean up