refactoring data pt 2