some style clean up