Comments from code review

Let's organise a time tomorrow to walk through them