Cleanup
Restructured
Structuring and unification