Several simplifications