Removes a to do
Adds comments
Removes unused code