Removes commas
Cleans up code