Review feedback from WouterJ