fixed styleguide issues