Edits based on @giodif's feedback