Style and clarity fixes.