addition comment (javadoc)
litle refactoring
litle fixing