ug-2835: cleanup logging
Merge pull request #11 from cywjackson/ug-2835

ug-2835: cleanup logging