work done:
a) verified test coverage and passing
b) removed unnecessary else block following if-return
c) verified that all tests pass