Minor clean up of base class