minor simplifications
MORE ABSTRACTION