simplify code by using if then return instead of if then else wherever possible

remove complexity by replacing
```python
if condition:
    # if code
else:
    # else code
```
with
```python
if condition:
    # if code
    return
# else code
```