More styleGuide.
Some refactoring.