some style cleanup
some style cleanup