refactor: more changes