Optimized it a bit... because optimization