remove use of inline conditionals

Makes code coverage reporting more accurate. Simplified other various logic as well.