Adding todos and tidying