Some javaDoc and changed names