PSR-2 formatting.
Cleanup unit tests.