cleaned up sloppy code and got rid of the last of Data behaviour