Tidying up, todos in code comment, etc
Tidying up, todos in code comment, etc