Addressing more of @ElDeveloper's comments