some style changes/ cleanup