CHANGED reformatted comments for better merging