some style changes
merge