refactor script includes / part II