Major cleanup of code, getting ready for the turining it onto base class with 2 derived ones
Styling fixes