Reorganize and improve sections