more work on rewriting style