Optimised some

And cleaned up