Cleaned up logger