You are right, I'll refactor it.