Applied @WouterJ code review