fixing @eldeveloper suggestions