Tnx, I ask all these things because @relaxnow, (and also @oharsta ;-)) and I would really like to get rid of all the legacy in Janus. Refactoring just for refactoring does not really make sense. But since you are already changing so many things it seems like an ideal moment to move forward.