Okey then I will refactor it