Address comments from @ElDeveloper and @teravest