Cleanup and fix grammatical errors