This is not the way I would do it either but changing the code too drastically might confuse Kiwi more than help him/her so I decided to change as little as I could.