Format spacing better