working on #546, style fixes