minor style change etc
merge