@ramiro: You're probably right. I'll make a separate commit for refactoring.