Refactoring - made Data Project