Tidying up the TODOs