Add javadoc to classes ; Remove scope from logging