Add a few more comments^3
Tweak code a little