fixed some more styleguide issues