Some small cleanup and style tweaks.