dillon style tweaks
dillon merge