Make scripts more explicit