Small reorganization of styles