Some simplifiations
Some simplifiations