Cleanup some logging
Merge pull request #43 from mattrjacobs/2.x

Cleanup some logging