Restructuring + small edits