Formatting fixes.  Const corrections.