change to structure, small edits