Split up sections; add more comments