Applied some suggestions by Axel.