[CLC-1569] Cleaning up sloppy logging output

JIRA: https://jira.media.berkeley.edu/jira/browse/CLC-1569