Tidied up a few TODO comments