Changed @ElDeveloper's style suggestions