Add minor modifications to ternary operator and properties