Removing the double checking for the value of id