Styleguide fix and changing the name of the var