Improve: condition if