Reorganized and improved comments