Clean up styles quite a bit