Refactor sections again
Finish discussion