Address @ebolyen and @ElDevloper's comments