refactor script includes