Start fixing style guide issues