Revert "use less else cases"

This reverts commit 1204fc047cb8c3ba4014b5cfe74f7e15c405c2b9.