revised some style choices