Applying @corinnekrych's feedback