Grammar, typos and cleanup