Stylistic + doc changes.