minor style changes
merge