Logger clean up and comments