Added class definitions into script file
Code layout cleanup
Made script name more descriptive