Addressed changes suggested by @ElDeveloper and @josenavas