Changed javadoc based on suggestions