Added a bit better javadoc