Crossplatform section refactoring