Refactored Code to include functions
Added Setup and Teardown, changed VariableName