elastistor util refactoring