style improvements
merge