And few more optimizations.
Did I say "optimizations"?
This part was pretty silly, by the way.
Removed debugging fragments