Updated coding standards and fixed PMD issue

Explicitly used ConcurrentMap