simplify, optimize and fix punctuation