code styleguide cleanup