Clean up & Add Requirments