Stylistic changes.
Simplify.
Test.