Making minor changes suggested by @WouterJ