Updated javadoc according to review from KFC