Cleaning Up
Improvements
Working on data utility