change code structure in Utilitiy