Code cleanup from duplicates for base class. Convert dos to unix