More code cleanup and simplification
More code reorganization and clean up