Revert "Simplified If statements."

This reverts commit ce578f8cabc73064086d72f679112184c01bbabc.