New quote + style fixes