Removes commas
Removes unused import
Adds missing space