minor cleanup and subclass fix