Refactor unnecessary `else` / `elif` when `if` block has a `return` statement
Refactor unnecessary `else` / `elif` when `if` block has a `break` statement

Signed-off-by: James Cameron <quozl@laptop.org>  # remove whitespace changes