Final refactoring of SideBySide