Removed unused variables and created in-class file
Removed unnecessary variables
Removed unnecessary variables

Updated variable names