refactoring scripts, config, utils