[RFR] Cleaned some styme issues