refactor
Merge pull request #1 from Arkham/refactor

Script refactoring