Removed old data formatting
Started refactoring based on new data formatting