update some variables for conformance to the styleguide