fix stylings
merge master