Clean up sections & respond to Elena's comments