Structure, style fixes