Javadoc and fixing variable names