Refactoring S2C4.