Cleaning up things
Updating TODO