Added better javadoc