Clean up styles a little more