Applied Martin Nowak's requested changes.