Javadoc + typos + indentation + style