Improve description and cleanup.