T-Square Optimizations

Slightly changed T-Square for efficency