Further Improved Comments and formating