I am suggesting to move the code to where is it used.