Made quite a few commenting change