LockMap replaced by a ReentrantLockMap
Formatting