Added ToDo and global cleanup