Fix lots of little style things