Cleanup handling of styles