Cleaning up styles a bit more