Refactor: minor cleanups