optimized some stuff