refactor: code cleanups