Taking care of @wasade and @ElDeveloper comments