Proper javadoc comments