Rewriting and cleaning up

No match.