Minor format improvements