Regularize comment layout, some stylistic touch-ups