Restructured, documented