Cleaning up and added hive model