Cleaning up and marking TODOs