variable naming clean-up & documentation improvements