Changes after feedback from @ge0rg.