Refactor decouple section