style tweaks
merge