Cleaned up data manipulation scripts