Some simplifications

See title