Removes commas
Removes unused import
Cleans up code