Misc. cleanup and style changes.