Minor format & comment changes