
            Make comments and ternaries more clear

debd680