final style fixes