Cleaning up tiny TODOs