Change to tenary operators for defaults