Mostly trivial content and style cleanup