[refactor] and cleanup