moving Javadoc around a bit