Minor script tidy-up