Adding additional objects to break out messages from the formatting
function itself. Swapped if/else to simplify logic