inline a redundant variable and adds some javadoc