Test cleanup.
Conform to company styleguide.