Delete and style fixes