Clean up logging
Merge pull request #21 from svanoort/feature-cleanup-logging

Clean up logging