fixing some more styleguide issues