[#1532] "if" statement cleanup
2 files changed