Style fixes and cleanup.