Tidying up the comments and todo's.