Small update from suggestions by Gama11