fix local varibales and style