#59 improve style.
Fix tests!