Fix style isues