Typos, uniformity, tidy up