improve readability, fix some typos