Some cleanup
Optimize times