a few comments in the base class, simple refactorings