Some formatting optimization