re-structure, edits