style, expression and some other changes