Some simplifications
Some more simplifications