Summary if/else checks look at putting into a function for readability

[heathdbrown]

Per code review, need to look at functions for some of the clauses for readability.