Changed all true-default options to use ternary operators