You're right. Your code is much more clean and elegant. Will apply this.