Changes according to PR feedback part 2
Changes according to PR feedback part 2

pnguyen1097/billion-web,billioneffect/billion-web,billioneffect/billion-web,pnguyen1097/billion-web,pnguyen1097/billion-web,billioneffect/billion-web,pnguyen1097/billion-web,billioneffect/billion-web