Commented and restructured