Modifications after review

I don't understand why my PR ignored this...

@mlaflamm