Add remarks and simplify javadoc