Gentle reformatting of code and fixing a few typos.