UP: Improved comments