Further clean-up of script