Secondary code cleanup

Sorry - silly first commit had lines that could be further cleaned on
second thought.