Fix styleguide issues