Comment reorganization

Changed some comments