Refactor NLO-qq scripts