more style cleanup
final pre-client review style revisions