Style and typography fixes, and code style adherence. 

General style and typography changes are in one commit, and code changes in another.