ConcurrentHashMap style changes