Joe's style fixes