Apply jamezp code review (javadoc, thread-safe and logger)