Fixing ThreadLocal handling
White noise: formatting