Nasty pr

Use a guard clause instead of wrapping the code inside a conditional expression.<br>Redundant `self` detected.