Rearrange.
Fix codenarc problems.
Include unit test.