Small organization and cleaning up of styles