Update for style fixes