Cleaning up on logging

Cleaning up on loggine