Yes, we could to that. The code could be more clear.