Some simplification, some rustic renames