refactor: code clean up