Clean up logging
Merge pull request #30 from rgbkrk/better_logging

Clean up logging