Clean up a bunch of cruft for a better example