Restructure
Some small edits