Second round of optimization
Optimization cleanup