Code cleanup from duplicates for base class. Convert dos to unix
Merge commit 85ca57848f373b2fdda29f3ba2cd23cb38d38a84 (note
separate issue #159)