Code review: minor cleanups