Style tweaks, minor data structure doc update