Style fixes and corrections.