Code style.
Improved tests.