Removed unneeded checks and double item cast