Address comments from @wasade and @ElDeveloper