A few simplifications