Various edits to improve readability