Cleaned up both lists