Cleaned up type styles