refactoring : Move to Util