- remove/comment unused variables
- remove unused imports
- fixed some bugs using incorrect variables