Making tweaks based on @aerych’s feedback.