Fixed syntax errors and removed unused parameters