Some simplifications and renaming