Update code to address `deepsource` errors

It complained about an else-return issue[1] and some commented-out code

Link: https://pylint.pycqa.org/en/latest/user_guide/messages/refactor/no-else-return.html [1]