Clean ups in styles