Modified and simplified comments...