Some cleanups and style-fixes.