Merge "Simplify by using ?: operator"