Cleanup and standardize various case statements

[update] Case statements by quoting bare words
[update] Simplify log headers