Fix style. More fixes are coming