Refactor logging
Merge pull request #51 from sue445/feature/tweak_logging

Refactor logging