fixing @eldeveloper comments