Improved comments