small style changes
merge