Converted scripts to match design patterns