minor changes in Comments and Code-style