Refactor decouple sections