Fixing comma
Removing TODO