variable rename and removing the unrequired check