Moving common code down to base classes and clean up of config setting