Optimized some of the often used stuff