Add missing commas

Warnings: a thing.
Remove unused variables
Fix indentation