cleaned up some style issues