while you are at it, could you refactor this into an `if - else` rather than this? `if - then - return` is not very intuitive