I agree, I have moved it to a separate class.