Refactoring script to make consistent with others.