FIX:
- Remove unnecessary code
- Fix variable names
- Add missing ';'