shorten line length for reading clarity

* renaming over long variables
* wrapping lines under change