Comment fixes and style conventions.