Cleaned up using list.