comments revision and cleanup