Improved comments again