refactor: more code changes