don't modify variables
Merge branch 'stylefixes'

* stylefixes:
  don't modify variables