Some style fixes