UIO: minor style and comment fixes