Improved comments
Comment cleanup