refactoring scripts
123