Code cleanup: removed unused variable and organized imports
Organized imports
Code cleanup: fixed formatting
Code cleanup: removed unused variables