Clean up
Changes to logging