Take into account reid s comments from yeti collab

Hi neyric,

I took into account the comments from reid in your PR https://github.com/yui/yeti/pull/48.
You can just merge this into your branch.