Refactoring data section