Some clean up of scripts (cosmetic)