bring code in line with styleguide