Minor revision and cleanup.