Spring-cleaning of scripts