Code reviewing.

@bontchev

I've spent a few minutes doing that.

Sometimes, it is just easier to conclude that it is such a mess, that it is faster to just recreate from scratch.