code convention and javadoc refactoring
solved merge conflicts