Reorganized sections & notes