Update all

Various cosmetic changes the style of the code. No functional changes.