lots of style improvements
talk about testing