Revert "Improve if statement"

This reverts commit aa4f031c0918bf0c9538e137aca6c1a91c7d6b8c.
Better if statement