minor general improvments of variable names and javadoc