Small abstract changes
Some simplification and cleanup of the intro.