Optimized some things