Big cleanup of example.