refactoring

refactoring and utils class add