cleaning up some style issues