Add comment
Improve javadoc