More cleaning on code
-> 6800 bytes! New cap reached
6782 bytes
Back to 6856, but now, there's no more infinite loops