Consistent layout, and fix minor errors.