Add javadoc, and get rid of shortened variable names. Change-Id: I63aa3df1167c409a141eeae945e8b53d9c106251