Updated Javadoc and comment formatting