Update
Added better return statements