fix some styles
merge