some style and structure changes