Tidying and TODO notes