Source code cleanup

Replacing of C-style comments and some cleanups here and there.