Refactoring a Basic Script