Optimization

Optimized some stuff