refactor: trivial code cleanups