Adjustments from comments be @WouterJ