Yes, it's much more clear that way!, refactored in the latest commit.