Code review

Have a look at ToDo's as well, please.