a few simplifications