Revert "minor changes in Comments and Code-style"

This reverts commit d89a972888483b3306a8742130ca36a385f155d1.