Optimized some stuff on Cell