Refactor else branches

Signed-off-by: Antonio Murdaca <me@runcom.ninja>