Optimized some stuff

Faster/less space