Scripting: Felwood: A little cleanup to my previous commit