removed unnecessary condition checking