Improved Logger

Cleaned up code
Current thread logging (for debugging)