unconditional -> if
Small refactoring
Multiple unconditional -> if