You are right, I will refactor this.