Improve section before / after