Minor (mostly formatting) updates