few simplifications