Code formatting and corrections.