improve script to use function
2 files changed