Neatening up the nightly script