styling fixes
deplopy
merge